Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-11652-to-stable2512
git worktree add --checkout .worktree/backport-11652-to-stable2512 backport-11652-to-stable2512
cd .worktree/backport-11652-to-stable2512
git reset --hard HEAD^
git cherry-pick -x 387a7e2180b05276ffea4d093a9b8ea29d02f0dc
git push --force-with-lease

This pull request is amending an existing release. Please proceed with extreme caution,
as to not impact downstream teams that rely on the stability of it. Some things to consider:

• Backports are only for 'patch' or 'minor' changes. No 'major' or other breaking change.
• Should be a legit fix for some bug, not adding tons of new features.
• Must either be already audited or not need an audit.